gdk: Remove old code to create drawing context

You now have to use a GdkDrawingContext

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 4b2252fa995cd37891d42eee215bda3b51f65a08..5d581b7efc6e66237b539b699ec17e65ae55ae09 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -397,9 +397,6 @@ gdk_window_mark_paint_from_clip
 
 <SUBSECTION>
 gdk_window_get_clip_region
-gdk_window_begin_paint_rect
-gdk_window_begin_paint_region
-gdk_window_end_paint
 gdk_window_begin_draw_frame
 gdk_window_end_draw_frame
 gdk_window_should_draw
@@ -610,7 +607,6 @@ gdk_pango_context_get_for_display
 <FILE>cairo_interaction</FILE>
 gdk_window_create_similar_surface
 gdk_window_create_similar_image_surface
-gdk_cairo_create
 gdk_cairo_get_clip_rectangle
 gdk_cairo_get_drawing_context
 gdk_cairo_set_source_color

diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 59f1f2621969615d13e3764b90cf37cd2dda3655..dd874f7c5b2a30c60baaf6e8501f9df284cbb7e7 100644 (file)
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -31,9 +31,6 @@
 
 G_BEGIN_DECLS
 
-GDK_DEPRECATED_IN_3_22_FOR(gdk_window_begin_draw_frame() and gdk_drawing_context_get_cairo_context())
-cairo_t  * gdk_cairo_create             (GdkWindow          *window);
-
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_cairo_get_clip_rectangle (cairo_t            *cr,
                                          GdkRectangle       *rect);

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 678fdca526369d73ca7c367f6e579a5041392a23..e943af3e8664b45f013f7c5a3089558fd178992a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3013,85 +3013,6 @@ gdk_window_end_paint_internal (GdkWindow *window)
   gdk_window_free_current_paint (window);
 }
 
-/**
- * gdk_window_begin_paint_rect:
- * @window: a #GdkWindow
- * @rectangle: rectangle you intend to draw to
- *
- * A convenience wrapper around gdk_window_begin_paint_region() which
- * creates a rectangular region for you. See
- * gdk_window_begin_paint_region() for details.
- *
- * Deprecated: 3.22: Use gdk_window_begin_draw_frame() instead
- */
-void
-gdk_window_begin_paint_rect (GdkWindow          *window,
-                            const GdkRectangle *rectangle)
-{
-  cairo_region_t *region;
-
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  region = cairo_region_create_rectangle (rectangle);
-  gdk_window_begin_paint_internal (window, region);
-  cairo_region_destroy (region);
-}
-
-/**
- * gdk_window_begin_paint_region:
- * @window: a #GdkWindow
- * @region: region you intend to draw to
- *
- * Indicates that you are beginning the process of redrawing @region.
- * A backing store (offscreen buffer) large enough to contain @region
- * will be created. The backing store will be initialized with the
- * background color or background surface for @window. Then, all
- * drawing operations performed on @window will be diverted to the
- * backing store.  When you call gdk_window_end_paint(), the backing
- * store will be copied to @window, making it visible onscreen. Only
- * the part of @window contained in @region will be modified; that is,
- * drawing operations are clipped to @region.
- *
- * The net result of all this is to remove flicker, because the user
- * sees the finished product appear all at once when you call
- * gdk_window_end_paint(). If you draw to @window directly without
- * calling gdk_window_begin_paint_region(), the user may see flicker
- * as individual drawing operations are performed in sequence.  The
- * clipping and background-initializing features of
- * gdk_window_begin_paint_region() are conveniences for the
- * programmer, so you can avoid doing that work yourself.
- *
- * When using GTK+, the widget system automatically places calls to
- * gdk_window_begin_paint_region() and gdk_window_end_paint() around
- * emissions of the expose_event signal. That is, if you’re writing an
- * expose event handler, you can assume that the exposed area in
- * #GdkEventExpose has already been cleared to the window background,
- * is already set as the clip region, and already has a backing store.
- * Therefore in most cases, application code need not call
- * gdk_window_begin_paint_region(). (You can disable the automatic
- * calls around expose events on a widget-by-widget basis by calling
- * gtk_widget_set_double_buffered().)
- *
- * If you call this function multiple times before calling the
- * matching gdk_window_end_paint(), the backing stores are pushed onto
- * a stack. gdk_window_end_paint() copies the topmost backing store
- * onscreen, subtracts the topmost region from all other regions in
- * the stack, and pops the stack. All drawing operations affect only
- * the topmost backing store in the stack. One matching call to
- * gdk_window_end_paint() is required for each call to
- * gdk_window_begin_paint_region().
- *
- * Deprecated: 3.22: Use gdk_window_begin_draw_frame() instead
- */
-void
-gdk_window_begin_paint_region (GdkWindow            *window,
-                              const cairo_region_t *region)
-{
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  gdk_window_begin_paint_internal (window, region);
-}
-
 /**
  * gdk_window_begin_draw_frame:
  * @window: a #GdkWindow
@@ -3330,27 +3251,6 @@ gdk_window_mark_paint_from_clip (GdkWindow *window,
   cairo_restore (cr);
 }
 
-/**
- * gdk_window_end_paint:
- * @window: a #GdkWindow
- *
- * Indicates that the backing store created by the most recent call
- * to gdk_window_begin_paint_region() should be copied onscreen and
- * deleted, leaving the next-most-recent backing store or no backing
- * store at all as the active paint region. See
- * gdk_window_begin_paint_region() for full details.
- *
- * It is an error to call this function without a matching
- * gdk_window_begin_paint_region() first.
- **/
-void
-gdk_window_end_paint (GdkWindow *window)
-{
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  gdk_window_end_paint_internal (window);
-}
-
 /**
  * gdk_window_flush:
  * @window: a #GdkWindow

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index fb495a989d0df92756fb26692568679406b99714..aaaafcbb37b08011e70d976d99ed18f0dbd9d8ed 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -725,17 +725,9 @@ GDK_AVAILABLE_IN_ALL
 cairo_region_t *gdk_window_get_visible_region(GdkWindow         *window);
 
 
-GDK_DEPRECATED_IN_3_22_FOR(gdk_window_begin_draw_frame)
-void         gdk_window_begin_paint_rect   (GdkWindow          *window,
-                                            const GdkRectangle *rectangle);
 GDK_AVAILABLE_IN_3_16
 void         gdk_window_mark_paint_from_clip (GdkWindow          *window,
                                               cairo_t            *cr);
-GDK_DEPRECATED_IN_3_22_FOR(gdk_window_begin_draw_frame)
-void         gdk_window_begin_paint_region (GdkWindow          *window,
-                                            const cairo_region_t    *region);
-GDK_DEPRECATED_IN_3_22_FOR(gdk_window_end_draw_frame)
-void         gdk_window_end_paint          (GdkWindow          *window);
 
 GDK_AVAILABLE_IN_3_22
 GdkDrawingContext *gdk_window_begin_draw_frame  (GdkWindow            *window,